Adwaita: use currentColor for scale marks.
authorLapo Calamandrei <calamandrei@gmail.com>
Tue, 1 Sep 2015 16:52:20 +0000 (18:52 +0200)
committerLapo Calamandrei <calamandrei@gmail.com>
Tue, 1 Sep 2015 16:52:20 +0000 (18:52 +0200)
So it should work ok when used in selected items.

gtk/theme/Adwaita/_common.scss
gtk/theme/Adwaita/gtk-contained-dark.css
gtk/theme/Adwaita/gtk-contained.css

index 1f13b4278f4488d1ab0047bf2c2c7e00a958629d..29789542a92d66458e819a5dc84bffc16230d6ad 100644 (file)
@@ -2336,7 +2336,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
       -GtkRange-slider-width: 24;
       -GtkRange-trough-border: 2;
 
-      color: transparentize($fg_color, 0.7); // marks color
+      color: gtkalpha(currentColor, 0.5); // marks color
 
       @extend %#{$we}_#{$dn};
 
index 62aacf4c5004800d3c2bc58e66416082a66baf47..4a01502ee3b7686d176f1eb3bc7e545f369132f4 100644 (file)
@@ -3079,7 +3079,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
-  color: rgba(238, 238, 236, 0.3); }
+  color: alpha(currentColor,0.5); }
   .scale.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3133,7 +3133,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
-  color: rgba(238, 238, 236, 0.3); }
+  color: alpha(currentColor,0.5); }
   .scale.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;
@@ -3187,7 +3187,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
-  color: rgba(238, 238, 236, 0.3); }
+  color: alpha(currentColor,0.5); }
   .scale.vertical.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3241,7 +3241,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
-  color: rgba(238, 238, 236, 0.3); }
+  color: alpha(currentColor,0.5); }
   .scale.vertical.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;
index 99bb8aad037907d5f9017d9268b0874ea7ab2237..f8e5619e021f880ffa42b9af80ceffab3a4ca7f2 100644 (file)
@@ -3241,7 +3241,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
-  color: rgba(46, 52, 54, 0.3); }
+  color: alpha(currentColor,0.5); }
   .scale.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3295,7 +3295,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
-  color: rgba(46, 52, 54, 0.3); }
+  color: alpha(currentColor,0.5); }
   .scale.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;
@@ -3349,7 +3349,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
-  color: rgba(46, 52, 54, 0.3); }
+  color: alpha(currentColor,0.5); }
   .scale.vertical.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3403,7 +3403,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
-  color: rgba(46, 52, 54, 0.3); }
+  color: alpha(currentColor,0.5); }
   .scale.vertical.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;